From: Boyuan Yang <073plan@gmail.com>
Date: Thu, 21 Jun 2018 03:08:02 +0000 (+0800)
Subject: debian: Include previous works in 1.0.4-5.
X-Git-Tag: archive/raspbian/1.1.9+ds1-4+rpi1^2^2~178
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https://%22%22/%22http:/www.example.com/cgi/%22https:/%22%22?a=commitdiff_plain;h=100d6a4a37dbb7c2869679dc32d733a49a3b3470;p=opencc.git

debian: Include previous works in 1.0.4-5.
---

diff --git a/debian/changelog b/debian/changelog
index 3574f72..a480d1c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,13 +10,21 @@ opencc (1.0.5-1) unstable; urgency=medium
   * d/patches: Refresh patches.
   * d/changelog: Remove trailing spaces.
   * d/control: Use debian-input-method maillist in Maintainer field.
+    Closes: #899625.
   * d/control: Use canonical Vcs URL.
-  * d/control: Bump Standards-Version to 4.1.3.
+  * d/control: Bump Standards-Version to 4.1.4.
   * d/control: Bump debhelper compat to v11.
   * d/rules: Use NEWS.md as upstream changelog.
+  * d/rules: Use "dh_missing --fail-missing".
   * d/shlibs: Explicitly require the latest library version.
 
- -- Boyuan Yang <073plan@gmail.com>  Mon, 12 Feb 2018 09:30:54 +0800
+ -- Boyuan Yang <073plan@gmail.com>  Thu, 21 Jun 2018 11:07:39 +0800
+
+opencc (1.0.4-5) unstable; urgency=medium
+
+  * Make ocd data files arch:any (Closes: #851733)
+
+ -- Aron Xu <aron@debian.org>  Fri, 20 Jan 2017 15:15:35 +0800
 
 opencc (1.0.4-4) unstable; urgency=medium
 
diff --git a/debian/control b/debian/control
index d0f5e14..56dd410 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,7 @@ Uploaders:
 Build-Depends:
  cmake,
  darts,
- debhelper (>= 11),
+ debhelper (>= 11~),
  doxygen,
  libjs-jquery,
  libtclap-dev,
@@ -42,6 +42,8 @@ Depends:
  libopencc2-data,
  ${misc:Depends},
  ${shlibs:Depends},
+Breaks: libopencc2-data (<< 1.0.4-5~)
+Replaces: libopencc2-data (<< 1.0.4-5~)
 Description: simplified-traditional Chinese conversion library - runtime
  opencc is a library for converting character between traditional Chinese and
  simplified Chinese.
@@ -54,9 +56,11 @@ Multi-Arch: foreign
 Depends:
  ${misc:Depends},
 Breaks:
- libopencc-dev (<< 1.0.4-2),
+ libopencc-dev (<< 1.0.4-5~),
+ libopencc2 (<< 1.0.4-5~),
 Replaces:
- libopencc-dev (<< 1.0.4-2),
+ libopencc-dev (<< 1.0.4-5~),
+ libopencc2 (<< 1.0.4-5~),
 Description: simplified-traditional Chinese conversion library - data files
  opencc is a library for converting character between traditional Chinese and
  simplified Chinese.
diff --git a/debian/libopencc2-data.install b/debian/libopencc2-data.install
index c4a0cc8..759378e 100644
--- a/debian/libopencc2-data.install
+++ b/debian/libopencc2-data.install
@@ -1,3 +1,2 @@
 usr/share/opencc/*.json
-usr/share/opencc/*.ocd
 usr/share/opencc/doc/*
diff --git a/debian/libopencc2.install b/debian/libopencc2.install
index 3ddde58..4e01c53 100644
--- a/debian/libopencc2.install
+++ b/debian/libopencc2.install
@@ -1 +1,2 @@
 usr/lib/*/lib*.so.*
+usr/share/opencc/*.ocd
diff --git a/debian/rules b/debian/rules
index 7bbfc94..74e90a3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -33,3 +33,6 @@ override_dh_auto_clean:
 
 override_dh_installchangelogs:
 	dh_installchangelogs -k NEWS.md
+
+override_dh_missing:
+	dh_missing --fail-missing